Skip to content

[pull] master from php:master#430

Merged
pull[bot] merged 31 commits intoturkdevops:masterfrom
php:master
Oct 7, 2025
Merged

[pull] master from php:master#430
pull[bot] merged 31 commits intoturkdevops:masterfrom
php:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Oct 7, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

arnaud-lb and others added 30 commits October 7, 2025 10:48
zend_runtime_jit() prevents concurrent compilation with
zend_shared_alloc_lock(), but this doesn't prevent blocked threads from
trying to compile the function again after they acquire the lock.

In the case of GH-19889, one of the function entries is compiled with
zend_jit_handler(), which fails when the op handler has already been replaced by
a JIT'ed handler.

Fix by marking compiled functions with a new flag ZEND_FUNC_JITED, and
skipping compilation of marked functions. The same fix is applied to
zend_jit_hot_func().

Fixes GH-19889
Closes GH-19971
* PHP-8.4:
  Fix race condition in zend_runtime_jit(), zend_jit_hot_func()
* PHP-8.5:
  Fix race condition in zend_runtime_jit(), zend_jit_hot_func()
* PHP-8.1:
  Upgrade Alpine in nightly job
* PHP-8.2:
  Upgrade Alpine in nightly job
* PHP-8.3:
  Upgrade Alpine in nightly job
* PHP-8.4:
  Upgrade Alpine in nightly job
* PHP-8.5:
  Upgrade Alpine in nightly job
* PHP-8.4:
  Upgrade Alpine in push job
* PHP-8.5:
  Upgrade Alpine in push job
The CURLOPT_FOLLOWLOCATION seems like a gcc bug, where the integer extension of
bool to long is lost, but I was unable to reproduce on godbolt.org.
* PHP-8.1:
  Update NEWS with info about curl 8.16 compat fixes
  Fix curl_setopt_ssl test for curl 8.16
  Fix more curl 8.16 issues
  Fix curl 8.16.0 compilation with zts
  Fix curl build failure on macOS+curl 8.16
* PHP-8.2:
  Update NEWS with info about curl 8.16 compat fixes
  Fix curl_setopt_ssl test for curl 8.16
  Fix more curl 8.16 issues
  Fix curl 8.16.0 compilation with zts
  Fix curl build failure on macOS+curl 8.16
* PHP-8.3:
  Update NEWS entry for curl 8.16 update
  Update NEWS with info about curl 8.16 compat fixes
  Fix curl_setopt_ssl test for curl 8.16
  Fix more curl 8.16 issues
  Fix curl 8.16.0 compilation with zts
  Fix curl build failure on macOS+curl 8.16
* PHP-8.4:
  Update NEWS entry for curl 8.16 update
  Update NEWS with info about curl 8.16 compat fixes
  Fix curl_setopt_ssl test for curl 8.16
  Fix more curl 8.16 issues
  Fix curl 8.16.0 compilation with zts
  Fix curl build failure on macOS+curl 8.16
* PHP-8.5:
  Update NEWS entry for curl 8.16 update
  Update NEWS with info about curl 8.16 compat fixes
  Fix curl_setopt_ssl test for curl 8.16
  Fix more curl 8.16 issues
  Fix curl 8.16.0 compilation with zts
  Fix curl build failure on macOS+curl 8.16
* PHP-8.5:
  [ci skip] Update NEWS for PHP 8.5.0 RC2
* PHP-8.3:
  PHP-8.3 is now for PHP 8.3.28-dev
* PHP-8.4:
  PHP-8.3 is now for PHP 8.3.28-dev
* PHP-8.5:
  PHP-8.3 is now for PHP 8.3.28-dev
* PHP-8.5:
  ensure test passes with prod config
@pull pull bot locked and limited conversation to collaborators Oct 7, 2025
@pull pull bot added the ⤵️ pull label Oct 7, 2025
@pull pull bot merged commit 5c2f629 into turkdevops:master Oct 7, 2025
1 of 3 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants